Fixes #4959
coding standards fix
Merge pull request #5621