Fork SYNC to 1.6