KFSQA-BA_fixes merging master into branch
Merging KFSQA-BA_fixes into master