Merge "Fix parameter name mismatch in getResourceIdentifier." into oc-dev