LPS-39810

Hey Brian,

I used a trick by changing the type of one parameter to avoid having to use a different method name.

Note that this pull contains a first commit that I've also sent to Sergio so that he does a push since some tests were broken.