Merge pull request #6392 from s0up/rescue-disarm-fix