Left in debug switch in test
Merge branch 'dev' into ms