Fixes #6917 - Monitor does not work.

Merged Carsten Rose requested to merge B6917MonitorDoesNotWork into master

Merge request reports