[beta-1.93] Backport locking fixes #16386
+34
−7
Merged
Loading