case 3084 - Removed tpl file.
Merge branch 'case-3084' into develop