LPS-48694 WIP - To be completed