Merge pull request #6596 from lostluck/patch-14

[BEAM-3612] Add way to query emitter registration