KFSUPGRADE-1005 merge to master