initial work [KFSQA-662]
finishing touches [KFSQA-662]
Merge branch 'master' into KFSQA-662