Merge "Improve how procstats history/checkins are managed."