Merge "resolve stage dir before validation" into oc-mr1-dev