Changes for 1.8.0 build.