Sync with r6.