r396: * Merges from 3.0: