Merge pull request #688 from pedrofvteixeira/monitoring

[BACKLOG-248][CLEANUP]