LPS-41512

Hey, I'm resending this after rebasing with current master.

Thanks!