Merging 16820:16891 from trunk.