Fix/split ZPAQ after upgrade