Differentiate between test-local and test-ci
Merge branch 'm6' into m7
Differentiate between test-local and test-ci