LPS-40421

Hi Brian, please consider this change based on the commit message. Thanks, Zs.