v20211201.4713

This is a nightly build off the tip of 'master'. It may be unstable and result in corrupted configurations or data loss. Use only for testing.

Changes:

Merge pull request #408 from klutvott123/reorder-simplified-pids

Reorder and rename simplified pids