Merge "oc-mr1-dev is OC-MR1, don't allow building beyond it" into oc-mr1-dev