Merge branch 'na/no-http-test-in-the-middle' into maint