Merge branch 'sepa-fixes-2320'