Fixes checkstyle violation.
Merge branch 'release/2.4'