Merge branch 'respect-proxy-settings-federation' into 'develop'