Fix latest merge
Update proxies
Fix configuration template
Merge pull request #1135 from nlegoff/fix-38-merges

[3.9] Fix build