Merge branch 'feature/map-jinja-yaml' into 'master'

Feature/map jinja yaml

See merge request !4