Merge pacesetters branch into main

[p-flock]

pacesetters is currently 144 commits behind main. 2021 updates can be merged into main first, and pacesetters_2021_updates can be merged into pacesetters first - in this process the data changes that provide for aggregate ratios for the pacesetters MBE:total data collection may be lost and can be re-implemented as a configuration.