file limit handling
ref #2538
Merge branch 'release/1.0.6'