Final 2.3.5 commit