Merge branch 'cm3_sync'