chore: update code after #7110
2 files changed