Changes for 1.8.2 build.