Kill switch fix default behaviour
Merge remote-tracking branch 'origin/master'