Merge 3.2. Remove duplicate ACKS and reorder slightly to prevent future dups.