Merge "Add some comments about thread-safety"