Merge branch 'hotfix/#6125-enforcing-braces-in-if-construct-usage'

Close #6125
Fix class description
Merge branch 'hotfix/#6128-isimage-file-validator-description' into develop

Close #6128
Forward Port #6128