LPS-32066

LPS-32066 WIP