Merge pull request #11847 from damosvil/fix/edt_cleanup_upon_tryArm