Changes for 1.6.4 build.