Sync with r16.