Use ContainerHierarchyFilter for TT non-top-level container matching
Merge branch 'tt-equiv' into stage

* tt-equiv:
  Use ContainerHierarchyFilter for TT non-top-level container matching