[KFSQA-994] merge from master