Merge "Fix mutex issue"