KFSQA-791 clean up for merge with master
Merge branch 'KFSQA-791c'