Merge branch 'feature/monitoring' into 'master'

remove names

See merge request !7