NEXT: [GH-1757] for 1.19.2