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