Dependency upgrade
Merge branch '1_2_X'