Merge "Move resetState from FieldValue to LogEvent" into rvc-dev