Merge branch 'tr/rfc-reset-doc' into maint