Merge "Fix context verification for relative dependencies" into oc-mr1-dev