1259/AAE base states implementation

Merge request reports