Merge "More work on procstats: save/restore state, fixes."