Backport of PID table code from trunk to 2.2... Create a branch for this until we test enough to fold into 2.2