Merge "Separate conversations from channels"