Adding support for non-sync sm
merge