Changes for 1.6.8 build.