Merge pull request #17078 from herbdool/ui-18