LPS-40805 Accidentally removed during rebase