KFSQA-873 base commit
KFSQA-873 test complete
KFSQA-873 merging master into branch for code review
KFSQA-873 merging master into branch
KFSQA-873 merging master into branch