LPS-31889

LPS-31889 Minimal solution