[KFSQA-765] [KFSQA-764] merged to master