[SYNCOPE-621] changed as suggested
Merge branch '1_2_X'