Merge from 'monitoring' branch
Merge from 'graph' branch