Merge pull request #2834 from TheBlueMatt/2024-01-cut-120