Fix cherry picks - needed mutual exclusion