Changes for 1.5.8 build.