Merge upstream

* Has hierarchy browse fixes in it