Merge changes If77c5ed9,I32479d89 into main

* changes:
  Don't assume a non-null name on UserInfo
  Synchronize access to sim data