Merge "Do not process messages until new messages are feeding"