chore: prepare core for #12602
9 files changed