Changes for 1.6.2 build.