[SYNCOPE-601] Merge from 1_1_X