Merge branch 'km/gc-eperm' into maint