Fix/4.0.x/plf 5406

Fix description:
   - Using forward instead of include to keep Content-type