Merge "Adapt SO to RO schema changes"