Sync to r10232