Merge "Add ResourceId validation helper method" into oc-dev