Merge branch 'jk/url-insteadof-config' into maint