Disable AAE by default.
Changed schemas for better support of first installations
Merge branch 'test' into dev