Apply diffs from N4104