Merge pull request #2594 from benthecarman/debug-monitor-update-id