This is a remake of !817 (merged)
Here the changes related to expand-as-tree have been removed. Yet, it's possible to add them on top of this branch again.
This is a remake of !817 (merged)
Here the changes related to expand-as-tree have been removed. Yet, it's possible to add them on top of this branch again.