Merge "Parse annotations within LogEvent" into rvc-dev