Merge pull request #1 from nebgor/MDL-27440_chunkyfix