automerge: d525891
* commit 'd52589185f57ce7eb633d12dec98e4bbae4e33fd':
Further work on issue #18640385: Add procstats test mode
automerge: d525891
* commit 'd52589185f57ce7eb633d12dec98e4bbae4e33fd':
Further work on issue #18640385: Add procstats test mode