Merge "Fix thread-shared field evades lock acquisition reported by Coverity"