Updated schema for aae
updated aae settings.
Merge branch 'test' into dev