[KFSQA-1007] more merge from master