Calibre 4.23.0 was released. This just replaces the second patch. the 
others should still apply without conflict.