Merge branch 'jk/maint-http-half-auth-push' into maint