Merge branch 'release/4.0.0' into develop
Code style fixes.
Merge branch 'release/4.0.0'