Merge pull request #6111 from dmatej/classanalyzer-race-backport-31 Classanalyzer race condition fix backport for 3.1