Sync with r9.