Merge documentation and config changes

Merged Mike Cichonski requested to merge dev into master

Merge request reports