Merge "Make the rs namespace visible" into oc-mr1-dev