[KFSQA-985] merge from master