Merge branch 'chore/mailmap' into 'develop'