This is the proposed fix for #2506. It provides a more complete message with regards to name collisions including informing of the opposing containers ID. I have included a test to ensure that the correct short id is displayed to make the message easier to understand. Upstream-commit: 3c67a2849337f3b9bd92dd389f0e02e48a36028b Component: engine