ESDEV-889 Port Sepa bug fix to development branch Implementing improved SEPA functionality