Changes for 1.2.5 build.