Merge branch 'jk/smart-http-hide-refs' into maint