Merge "Workaround for busy wait bug"