Merge branch 'topic/imap-drop'