Merge branch 'fix-form-delete' into develop
Update translations
Merge branch 'missing-template'