Merge "Mark config as non-translatable" into rvc-dev