LPS-47565

Same pull request for ee-6.2.x, but forward port for master