Depends on #2217

Pitch

Port the recent onboarding changes from upstream. I'm not completely convinced yet, but hopefully it will continue to improve and we'll manage to get something that makes sense.

Commits to port:

• 0461f83
• c35e3cb
• 746979f
• 140aa6b
• 6fdbee2
• b8a2430
• 52d36f0
• aa4c973
• 4a5464f
• 6833732
• f206980
• a985d58
• ed96e28
• bbea052 (not really onboarding but depending on those changes)

Motivation

Reduce divergences with upstream.