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