[KFSQA-635] merge KFSQA-635 to master