[Milestone] Merge Huangyi code