Merge 15165:15373 from trunk.