Revert "LPS-47505"

This reverts commit 3e29af24916e15ba540c1ca9ae2b4c9c8105ba3c.
Revert "LPS-47337"

This reverts commit 0f8a3aa9f3e6dd127c0709ba3783f9aba2c81234.
LPS-47505 Recheckin
Record