Merge "Add userId to log messages - DO NOT MERGE" into rvc-dev