Merge branch 'refs/heads/t/dynamic_chunks'