Fixes block templates for module clone
Merge branch 'develop' into user