Merge 14059:14394 from trunk.