fixup! Fixed lock-order-inversion

84 jobs for !3087 with 1470-threadsanitizer-lock-order-inversion-potential-deadlock-validator_start in 54 minutes and 51 seconds (queued for 5 seconds)
latest merge request