Sync to r12810
Sync to r12811