Merge "BUG-509: improve memory efficiency of ListenerTree"