Merge "make RBC string non-translatable"