am f1e44bb9: (-s ours) am ed2fe57c: Use single tree for multiple storage views.

* commit 'f1e44bb9c60d63c7e05212b85803808c4142d785':