Merge branch 'reverse_proxy_upstream_v4_fix' into 'develop'