[Codestyle] Removing some blanks
Merge branch 'staging' into 3.4-dev