KFSUPGRADE-330: fixing slowness with can void