Reformat
Merge remote-tracking branch 'upstream/master' into small-fixes-3
Merge pull request #3333 from ussuri/small-fixes-3

Reformat