Added aae status and reip.
Merge branch 'test' into dev