Avoid unnecessary casting
Merge branch '1_2_X'