Merge pull request #1208 from TheBlueMatt/2021-12-less-force-close