LPS-33701

@jhinkey, note last commit