LPS-46588 wip