LPS-33780

Hi @arbetts,

please verify I didn't miss something I don't see.

If you are OK with my changes I'll squish the commits and send them forward.

Thanks!

/cc @matthewkong