Merge "config seg aai elasticsearch"