Merge "Revert "VanillaIceCream/35 is now REL"" into main