Merging Mark III changes from 2020 dev run into main

Merged Jay Billings requested to merge next into main

Merging Mark III changes from 2020 dev run into main. This prepares us for RC builds and releases.

Merge request reports