LPS-34321

Hi Brian, Can you please backport this to 6.1?