Drop test proxy
auto-merge staging into master