Bug refix ZK-2061: the merge error causes vision test fail