LPS-47984

Hey Hugo,

This include the change that Ray wanted.

Thanks.