Merge remote-tracking branch 'origin/fix/4.0.0/PLF-4255' into feature/relooking