Final 1.6.2 changes

Final 1.6.2 changes before changing to new 1.6.4 workspace.