Bring back RC changes to develop