Merge branch 'rakhimov-google_style' into develop