LPS-40788

/cc @eduardolundgren @marcellustavares