MERGE: #15676: Proper attribution in Misc/ACKS