Merge branch 'mg/maint-tag-rfc1991'