Changes for 3.5.3 build.