Refactor
Only start timeline recording if its enabled in user settings
Merge branch 'master' into builds
7.26