Fix/4.0.x/plf 5610