[Bug] Dont comment out the switch statement
[Bug] Don't fix indentation in scrutinizer
Merge branch 'master' into develop