Commit the cherry pick of the chunking bug fix to main into devel for continued testing#214

The9Cat wants to merge 4 commits intomainEXP-code/EXP:mainfrom

develEXP-code/EXP:develCopy head branch name to clipboard