LPS-51814 SF

Please don't merge, running tests only.

Thanks