options save/restore mostly working
Authored by: Jean-Francois Dockes 2017-11-23
Parent(s): [9461f7]
Child(ren): [b60a1a]