[KFSQA-709] Merged KFSQA-681 to this jira and reworked.