Merge branch 'jl/some-submodule-config-are-not-boolean' into maint