Merge "Fix bug #7148393 Switch can crash when hierarchyviewer is connected" into jb-mr1-dev