Changes for 1.8.5 build.