Bring 1.4.7 2i AAE fixes to 2.0