fix lock order reversal

Mark Andrews requested to merge fix-lock-order-reversal-v9_12 into v9_12

Merge request reports