Final 2.4.3 commit