[WIP] Upgrading 4.2.3/4.2.4 to 4.3 fixes