Restoring "Stack Monitoring" after 6.8->7.2 upgrade

monitoring: https://pastebin.com/sCYFE9pc
mapping: https://pastebin.com/Lu7FAgMr

Hopefully you can see both of those