Changes for 1.8.4 build.