Merge pull request #2981 from dunxen/2024-03-PR2419fixups