Merge "[aai-spike] Update schema ingest configuration"