Merge "Fix UI string" into main