Merge "Add mutex"