Staging sanitize

Eisenhauer, Gregrequested to merge
github/fork/eisenhauer/StagingSanitize into master

Address issue #1633 (closed), as well as various other things.

Merge request reports