Merge "Add a convenience method to facilitate tests" into oc-dr1-dev