Merge branch 'eduard-4'
Merge branch 'master' into eduard-4