adding support for dev proxy and httpclient
updated after merge