Dev -> master

Merges `dev`changes with composerised twig dependency