Issue #2619788 by pcambra: Get instance info from the entity instead of from the source for file mappings