cherry-pick chore: dummy change to be cherry-picked with conflict (#3) to branch release-2.8

[maybe-vibe]

Cherry picking #3 onto branch release-2.8,

This PR/issue was created by cherry-pick action from commit e8726a7.,