LPS-45880

For master only. ee-6.2.x will be sent after this is approved.