Merge branch 'feature/monitoring' into 'master'

replace gems to pkgs

See merge request !6