Merge "Remove resource overlay" into oc-dev