Final 4.3.4 commit