LPS-44232 part 1

First batch of changes for this ticket