Resolve "resolver test failing"

Merged Mark Andrews requested to merge 649-resolver-test-failing-v9_12 into v9_12

Merge request reports