Sync with e82744.