Sync with 614f48.