Merge branch 'draft/mc/generic-messaing-fix' into 'draft/lukem/generic-messaging'

Draft/mc/generic messaing fix

See merge request !121
in 14 seconds, using 0 compute credits, and was queued for 1 minute and 49 seconds
latest