[36] Final thread-safety reivew