Sync with latest 4k changes.