all is working [KFSQA-860]
Merge branch 'master' into KFSQA-860