KFSUPGRADE-985 Add changes in from 5.2.1