Merge "Fix bug #8054449 hierarchyviewer crashes on connection/disconnections"