Preparing to add numThreads to reference.conf
Merge remote-tracking branch 'origin/sr' into sr