merged with dev-lena
Merge remote-tracking branch 'remotes/origin/dev-lena-bn' into Emil-Dev-CS
#CEXT-135 fix sync
#CEXT-127 #comment