case 1683 - Fixed notices in template.
Merge branch 'case-1683' into develop

* case-1683:
  case 1683 - Fixed notices in template.