refs #10705 All fixed
Merge branch 'bugfix/10705_BrokenDirectGUI' into develop