Merge branch 'tc/maint-transport-ls-remote-with-void' into maint