These are manual edits in addition of the automated changes from the
previous commit.
(manually picked from commit 1436025e20)
These are manual edits in addition of the automated changes from the
previous commit.
(manually picked from commit 1436025e20)