Update HC client
Merge branch '1_2_X'