Merge pull request #1406 from BrzVlad/monitor-resurrect