Merge "Fix context verification for relative dependencies"