[12.0] Mix sepa with non-sepa orders

[ecino]

These are the same changes as #689, ported to v12. See #658 for discussion reference

[github-actions[bot]]

There hasn't been any activity on this pull request in the past 4 months, so it has been marked as stale and it will be closed automatically if no further activity occurs in the next 30 days. If you want this PR to never become stale, please ask a PSC member to apply the "no stale" label.