Changes for 1.7.1 build.