Potential fixes for harness for 2.2
Merge pull request #3337 from tinwelint/2.2-fix-harness

Potential fixes for harness for 2.2