chore: missing changes from #11736
2 files changed