Merge "Fix issue with" into rvc-dev