LPS-33704

@jhinkey please note the last commit