On ui: "setup" (reverse-merged from commit 696a4628c3b5a3e75082c334e832f5e0c921c629)