remove debugswitch
Merge branch 'develop'