Merge branch 'jk/maint-push-config' into maint