Sync to 12824.