LPS-39077

cc @ealonso, @sergiogonzalez