Removed another redundant SWITCH variable
Merge branches 'dev' and 'master'