Fixing bug when Twig forms are not used
Merge branch 'develop'
Merge branch 'master' into develop