Merge 16355:16480 from trunk.