Merge branch 'ap/log-mailmap' into next