KFSUPGRADE-973 : merge to kfs-5.2.1 - apply PDP changes to Cu
customization