Merge "Update the message versioning system."