Avoid endless loops.
Avoid same methods on both client and outer connection.
Merge branch 'v1' into v2