chore: improve cherry pick missed message (#38496)