Dont encode circuit_id in CustomProxyConversion.encode
Merge remote-tracking branch 'origin/coroutines' into coroutines