r6743: Merge r6741 from 4_0