Merged branch 'fix_chunks'.