Revert "Revert "Merge remote-tracking branch 'origin/master' into Morozova_UI""

This reverts commit 3844c7b7d766bc76a790a1f0d25a24aa505ad76c.