LPS-31791

LPS-31791 Preliminary implementation