bugbix from the previous commit
Merge branch 'devel'
v0.140

    bugfiz from the previous commit