Merge branch 'mm/keyid-docs' into maint