KFSUPGRADE-1067 adding foundation fixes that will come out in 5.3