Final 1.3.9.6 changes