Merge pull request #2953 from dunxen/2024-03-fix2941