Sync with r5.