LPS-33682

Hi Sergio, I sent a separate pull for the commits for LPS-33277 to Brian.