[KFSQA-854] merged with master before review