[[ Bug 12294 ]] Make sure we copy the correct number of MCMessageList structs when shifting messages!
Merge branch 'bugfix-12294' into develop