Merge "AAF documentation" into casablanca