Merge branch 'jk/maint-config-multi-order'