Merge "Fix AAF integration config"