Merge branch 'sb/http-flaky-test-fix'