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