Fixes latest build on develop : braces
Merge branch 'cs/#6940-braces-fixes' into develop

Close #6940