LPS-41765

Reviewed, works fine.

This is rather urgent and should be part of the 6.2.x