[KFSQA-763] merge from master