Merge branch 'feature/validate_template_before_save' into develop