Merge remote-tracking branch [KFSQA-606]