Merge branch 'rs/config-unit-parsing' into maint