LPS-41768

This little fix also should be inside the 6.2.x. Note that this fix depends on previous one, for LPS-41765 (#1588) - but will not give merge conflicts.