LPS-38072

Fixed the rebase problem