LPS-50325

@ZoltanTakacs needs to to backport the fix to 6.2