This matches the upstream changes in f19930f98a (cherry picked from commit 5988bdedae)
f19930f98a
5988bdedae