This should now be fixed on both Dev and Main.