KFSQA-BA_fixes should be working correctly now
[KFSQA-755] merge from master