KFSUPGRADE-1002 Fix merge