these changes should not be in the pull request derived from this branch - removing it
Merge branch 'development' into proxy_support