Merge "Update to support staging behavior" into oc-dev