debug fixes and merge conflict

Merged Blodgett, David L. requested to merge (removed):master into master

Merge request reports