Merge "Improve resiliency of message parser in the case that events are missing" into marshmallow-cts-dev