Sync changes from branch new-ingestion PR #599

Sync and Resolve Conflicts