Merge branch 'rs/rs-mailmap'