Merge pull request #1525 from jkczyz/2022-05-release-0.0.107