Merge branch 'kk/maint-prefix-in-config-mak'