Changes for 1.6.9 build.