Add "enabled/disabled" option into the system configuration
Merge remote-tracking branch 'origin/master'