Merge branch 'features/ingestion-no-nil' into 'develop'