Check for duplicate OAI threads
Merge branch 'newdev' into test