Code

Merge branch 'jc/clone-bind-failure'