KFSUPGRADE-993 : merged to kfs-5.2.1 - vendor batch job