Merge "Dump more per-user data in IMMS" into main