Merge "Reduce shell power over user management." into nyc-dev