Final 4.3.1 commit