Re #10705 Minor improvements
Re #10705 Fixing typo (and unit test)
Merge branch 'bugfix/10705_BrokenDirectGUI' into develop