Fix 0820 after upstream merge