oops: Fix missing 2nd param to ::lookupByMessageId
Merge remote branch 'upstream/develop' into develop-next