duplicate template entry and extra spaces removed
Merge branch 'misc_fixes' into keep_version