Merge pull request #19918 from sledgehammer999/webui_opt