Merge pull request #1304 from jkczyz/2021-12-remove-mut-ref