Sync with 475af0.