384748: thread safety improvements
2 files changed