Merge branch 'rs/config-write-section-fix'