Disable AAE by default.
Merge branch 'test' into img_fix