KFSUPGRADE-1051 Add fix