[KFSQA-763] merged to master