Merge "Add thread safety documentation"