[KFSQA-685] merge to master
Merge remote-tracking branch 'origin/master'