upstream 8.2.1