Changes for 1.6.1 build.