KFSPTS-3580 fix merge