Merged 16488:16743 from trunk.