LPS-46842 Rebase