LPS-45766 SF after revert

Pushed to upstream