Synchronize Yicheng AI with the hegemony branch
I must have missed some commits 0.0....