Merge pull request #10183 from miminar/safe-stop-kill

Stop and Kill commands made robust