Merge pull request #1541 from jkczyz/2022-06-nit-follow-ups