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

Fix jinja coding

See merge request !3