Merged trunk changes 17245:17471 into branch