Merge branch 'jt/clone-server-option'