Merge "T589: Fix insufficient ordering guarantees in bakery lock" into integration