Merge branch 't/gui_reload_fix'