Merge 16012:16110 from trunk.