Merge remote-tracking branch 'origin/pretty-user-display' into autostaging