ESDEV-889 Port Sepa bug fix to development branch Added template changes for 'basic' theme.