Merge "Fix parantheses in conditional" into rvc-dev