PLF-6049 : Fix previous merge from stabilization