Merge "Solve the naming problem for vendor property" into rvc-dev