Merge "RESTRICT AUTOMERGE Make log reader thread a class member" into rvc-dev