Correct the template
Merge branch 'development' into current-sprint