Changes for 1.3.5 build.