Preserve any unprocessed data when there is more than one message to process
Merge branch 'preserve_unprocessed_data'