Merge "Add command to retrieve the instant app resolver" into oc-dev