Backport AA fix to 9.2