Merge branch 'jt/t5551-test-chunked'