LPS-33277

Hi Julio, I am sending you this first. Since I need to rebase LPS-33682 anyways, I'll apply these changes as well and will send it that way.