Merge "Updated due to changes in how the adapter formats message data"