Changes for 3.7.0 build.