Merge branch 'feature/monitoring-syncid' into 'master'

Fix grains generation

See merge request !5