Merge pull request #6126 in master
added missing { and } after if
Merge branch 'hotfix/#6125-enforcing-braces-in-if-construct-usage' into develop

Close #6125
Forward Port #6125