LPS-38734

Also needs to be pushed to 6.1.x branch