Merge branch 'local_dev' into local_guenole_features
Minor change
Merge branch 'local_guenole_features' into local_dev