Fix bad merge
Merge branch '4.3' into 4.4