Merge remote-tracking branch 'origin/8706_functional_improvement_of_gui' into 8706_functional_improvement_of_gui
Merge remote-tracking branch 'origin/8706_functional_improvement_of_gui' into 8706_functional_improvement_of_gui