This re-introduces the dummy entity naming code, originally introduced in #29178 and randomly removed by #30064 with no technical justification given. Fixes #31373
This re-introduces the dummy entity naming code, originally introduced in #29178 and randomly removed by #30064 with no technical justification given. Fixes #31373