Cherry-pick of "Merge branch 'ThreadsUpdate-1.0-20180208' into '1.0'" into master
FindThreads Update, 1.0 branch (2018.02.08.)
See merge request !232 (merged)
(cherry picked from commit 72c40ada)
FindThreads Update, 1.0 branch (2018.02.08.)
See merge request !232 (merged)
(cherry picked from commit 72c40ada)