Merge pull request #2169 from TheBlueMatt/2023-03-monitor-e-monitor