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