Merge pull request #1499 from tnull/2022-05-fix-unreachable-warning