Merge "Debug message fix" into rvc-dev