Merge "Avoid cross lock acquisition leading to deadlocks"