Merge "BUG-650: optimize subtree listener collection"