Re #10705 Should fix system tests
Merge branch 'bugfix/10705_BrokenDirectGUI' into develop