Imprved configuration options for AAE.
Merge branch 'test' into dev