[KFSQA-839] more merge from master