Make fork mergable with upstream tnwinc repo.