Merge branch 'ye/doc-http-proto' into maint