Changes for 1.3.6 build.