Merge "Update AAF indicators"