Advanced settings

Merged Christophe Deschamps requested to merge feature/advanced_settings into master

Merge request reports