Fixed: tof_list did not load stopping properly
Merge branch 'master' into experimental