NEXT: [GH-1803] for 1.19.6