[aat] Further improvements on feat (#948)

3 files changed