custom monitoring
Merge branch 'new/cm-api'