Add wait before dropping, up to release version
Up to next snapshot version