Merge 16216:16355 from trunk.