Merge 16110:16487 from trunk.