Corrections to templates.
Merge remote-tracking branch 'origin/development' into current-sprint