[KFSQA-635] Merge master to KFSQA-635