[SYNCOPE-598] fixed
Merge branch '1_2_X'