[SYNCOPE-601] Merge from 1_1_X
Merge branch '1_2_X'