Merge pull request #2704 from BrzVlad/fix-monitor-abort