Merge "Only act on event if something actually changed" into rvc-dev