Merge branch 'ramv/fix-topo-tree' into charm