LPS-37702 Reapply
LPS-37702 Fix unit test
LPS-37702 SF
LPS-37702 SF