Monitoring enhancements

From 5012EW5JYM 5012EW5JYM