LPS-42403 work in progress