Changes for 1.5.2 build.