LPS-36407

cc @epgarcia