LPS-49898

cc/ @marcellustavares