Changes for 1.6.3 build.