By rblanker: Re-ordered overlapping update functions on v3.2.4 from 7037, 7038, 7039 to 7068, 7069, 7070.
Version 3.5.x-RC1 build 2051.