Merge "Fix lock ordering violation"