Update to AE rv1 b12