Merge pull request #1275 from jkczyz/2022-01-benchmark-improvements