LPS-43116 second attempt

Here we go!

@ealonso