NEXT: [GH-1790] for 1.19.2