Merge 16070:16110 from trunk.