Change default listener ID to null
Merge branch 'named-listeners' into middleware