Replace on/off stuff with one.
Merge branch 'master' into MNF

* master:
  Replace on/off stuff with one.