LPS-37463

cc @epgarcia