Sync with 5b5964.