Hotfix for tests dir variable
Merge remote-tracking branch 'origin/integration-v1.3' into integration-v1.3