Changes for 1.7.0 build.