Feature/dependent proxy config

Merged Nicolas Michon requested to merge feature/dependent_proxy_config into master

Merge request reports