Issue #3594036: Prevent false current entity matches across entity types

Closes #3594036

Merge request reports

Loading