Merge "Allow removing messages before EventHub created"