Merge pull request #1928 from valentinewallace/2022-12-fix-main