Merge "Jarjar duplicate classes" into rvc-dev