Merge "[Minimal HUN] strip subText in  Minimal HUN" into main