Merge pull request #553 from olga-jane/master

Update O_Morozova
fixed TestSaveSettings unit test
Merge pull request #554 from olga-jane/Morozova_BugFix

Morozova fix Unit test - TestSaveSettings