[settings] test prog and minor updates for persistent settings
Merge remote-tracking branch 'upstream/master'