r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need