Update Herochat 5.7 branch