BUG-865: prepare to move ListenerRegistry