KFSQA-873 test complete
KFSQA-873 - these changes are from master
KFSQA-873 merging master into branch
KFSQA-873 merging master into branch