Fix matcherThreads bugs

Hadi Quesneville requested to merge master into dev-2.32

Merge request reports