#12 update the multiple XA code from MDEV-3861