Sync with r18.