Improve name generation on concurrent requests Upstream-commit: 0d9a5ce6dd061089a3a485bf359a054d83b74059 Component: engine