Conform with upstream

(cherry picked from commit 615ae563e2359662ebd988b7af46b7f861a46bd9)