Merge branch 'bc/http-backend-allow-405' into maint