Removed redundant SWITCH_[Is|Js] variables
Merge branches 'dev' and 'master'