Merge pull request #1007 from jkczyz/2021-07-stop-drop-shutem-down