318 settings set

Matthieu Lamalle requested to merge 318_settings_set into develop

Merge request reports