Merge from tudouui/hrt