User switching updates

These are the updates that were already reviewed, now going into `unstable`.  @wmathurin @bhariharan let me know if you want to look over it any further.