[KFSQA-697]more merge from master