Merge branch 'eduard-3'
Merge branch 'master' into eduard-3