UNCLASSIFIED - NO CUI

2.16 cherrypick

Michael Martinrequested to merge
2.16-cherrypick into master

Cherry pick changes for Release 2.16.0

Closes #1838 (closed)

Edited by Michael Martin

Merge request reports

UNCLASSIFIED - NO CUI