Merge branch 'rs/rs-mailmap' into maint