Merge pull request #2167 from TheBlueMatt/2023-04-monitor-e-monitor-prep