Merge 16817:16819 from trunk.