[NSM] work with synchronization
merge commit