Fixes #4959
coding standards fix
Merge pull request #5621
Merge pull request #5621 in master