Changes for 1.6.5 build.