Changes for 1.2.2 build.