Merge "Fix incorrect locking order"