Merge "BUG-868: migrate ListenerRegistry"