[10.x] Fix ListenerMakeCommand
deprecations
#47517
Merged
ListenerMakeCommand
deprecations
#47517