Merge branch 'qn/clone-doc-use-long-form' into maint