LPS-43575 Second Preliminary commit to start working on this task