Merge branch 'master' of D:\IDEAProjects\GUI_autotests_10 with conflicts.
test
refactoring
refactoring