Changes for 1.6.7 build.