cherry-pick 71c21c06bf5325386653d2c3f4da31f2c537facd