Merge "Remove simColors from public.xml and rename" into rvc-dev