LPS-44633

This affects master. We will need to backport it to ee-6.2.x.