Merge pull request #4319 from leoetlino/sysconf Don't read/store settings directly from/to SYSCONF (and fix config restore)
