Update monitoring with changes from 'develop'

Bring it up-to-date for future work.