Merged 14009:14059 from trunk.