Merge pull request #1485 from ViktorTigerstrom/2022-05-add-force-close-param