Merge "Make the legacy string to follow new checking guideline." into rvc-dev