NEXT: [GH-1795] for 1.19.4