Cherry picked a old important commit