LPS-40928

Please backport to ee-6.2.x and 6.2.x