Changes for 1.1.8 build.