merged trunk -r 18510:18539