Maybe fixing 576
Merge branch '748-using-tarjan_for_entitytree' into develop