This is a backport of v6 of the TAA patch set, and will probably require updates before release. The subject lines for these patches didn't come through.
Ben Hutchings