Merge "Load internal resources using name rather than ID" into oc-dr1-dev