LPS-31889

LPS-318889 Initial work to be tested and completed