Changes for 3.5.1 build.