LPS-42790

Can we backport this ticket to 6.2.x and ee-6.2.x?