all is working [KFSQA-860]
Merge branch 'master' into KFSQA-860
[KFSQA-994] one more merge from master