LPS-35593

Hey Hugo, sorry about not rebasing.