Add test documenting issue 253
Add check to auto-chunking code to avoid infinite loop
Merge branch 'issue_253' into 2.1