BC-2053 #fixed for use EmfModel
Merge remote-tracking branch 'origin/2.1.x'