Merge branch 'km/config-grammofix' into maint