Merging ingest changes from archive 4.1.0-RC1.
These are changes from the archive, version 4.1.0-RC1, so if they make no sense, bring it up with Jim and Rick.
These are changes from the archive, version 4.1.0-RC1, so if they make no sense, bring it up with Jim and Rick.