Merge "Make the new RoR atoms compile" into sc-dev