Ensure we keep the main_switch to False on new configuration.
Merge branch 'master' into debian
1.0.3