Merge branch 'tc/http-urls-ends-with-slash' into maint