Copied experiment proxy support from proxy branch