[KFSQA-765] [KFSQA-764] merged to master
KFSPRJQ-307 merging master into branch for code review