LPS-39599

@jhinkey

Please give a higher priority on this review to make sure it can go into 6.2

Thanks