Teardrop updates in development branch

Is this the same issue that I describe in this thread?