Updates
Merge from SYNCOPE-1_1_X