ensure_chunks performance improved
Merge branch 'master' into app