Merge "aai search data  config alignment"