Merge branch 'pretty-user-display' into autostaging