add auto-monitor support (issue #5411)