Merge branch 'cleanup/unused-proxy-opts' into 'develop'