Changes to the unpacking and MQ macros from mCBM march 2022 runs

see commits messages

Draft status: To be rebased (should be trivial) and merged only after !814 (merged) is merged

Not sure whom to assign for the review