* Pull upstream Conversations 2.12.12
