Fix Assign id as name when all else fails Upstream-commit: 132db329d479c1d8712117534798810df8c1b8ec Component: engine