AAF integration modifications

No match.