Merge "BUG-509: Encapsulate ListenerTree"