NEXT: schedule #1747 for 1.18.4