Modules can't be final. Who knew?
Merge branch 'mbst-9831-basic-monitoring' into stage