Merge "Use constant names instead of literals" into rvc-dev