testbench regression: some other tests failed due to new HOSTNAME logic
Merge branch 'v7-stable' into v8-stable
Merge branch 'v8-stable'