LPS-33585

@jhinkey please note