Sync with 5b72ef.