Merge "Update logging" into rvc-dev