Merge branch 'jk/clone-allow-bare-and-o-together' into maint-2.38