Merge "Fix and refine works in UiTranslationController" into sc-dev