Add missing TLS hunks from the merge