Sync with af2c53.