[KFSQA-644] Merging changes so far. JIRA will be deferred for now.