Merge "Use ConversationCursor to optimization validation" into jb-ub-mail