Fix/4.0.x/plf 3020