Changes for 3.5.0 build.