Merge pull request #2864 from dunxen/2024-01-2797followups