Merge branch 'rc/ls-remote-default' into next