I think we should still retain the logic you originally had from the `MLA` where if there is no correlationId but there is a messageId, we should use it (in either the standard or custom correlation header).