Merge "Fix LogEventQueue_tests" into rvc-dev