Fix  #2252
Update
Merge branch '0.7.7' into connections-tree-refactoring