Track-like opt-in to ThOr

Gerhard Ravenrequested to merge
track-like-opt-in-to-ThOr into master

Goes with Rec!2690 (merged)

Edited by Nico Kleijne

Merge request reports