Sync with 283d63.