Codestyle fixes for 3.4 branch