Sync with r12.