Naming convention
collapsible if statement
Fix
conflit resolu
Merge branch 'Pierre-Sassoulas-upstream/dev' into dev