PLF-5989: Release 4.0.7