Merge remote-tracking branch 'origin/ui-canary' into ui-stable