[KFSQA-838] Fixed some merge-related errors.
Merge branch 'master' into KFSQA-916