Merge "Fix Tsan errors"