Merge pull request #2786 from tnull/2023-12-fix-warnings