Issue #3601071: Revert to previous isEmpty logic to prevent data loss.

Petr Illekrequested to merge
issue/reference_value_pair-3601071:3601071-removed-references-without into 5.0.x

Closes #3601071

Merge request reports