Changes for 3.6.0 build.