0.15.0.pre try #2 to isolate speed deadlocks