KFSUPGRADE-985 add 5.2.1 changes