Merge contribs

Open Dave Cooper requested to merge dcooper/zacl:merge-contribs into master

merging accumulated field changes from past several years

Merge request reports