Merge branch 'proxy-error' into 'develop'