Merge "Adding AAF configuration"