[FIX] cherry-pick 6ff4756c4413698f3d67ae7ef5c650c1cff5a57f