Merge branch 'sb/config-write-fix'