Merge GUI_Debug-tab branch from commit 674948