dev -> master - add Roziena's changes

Merged Drane, Lance requested to merge dev into master

Signed-off-by: Drane, Lance dranelt@ornl.gov

Merge request reports