Merge "Bug 5581: Optimize subtree filtering"