Single checkbox not remembering true value.
Merge origin/master