Timer/Thread naming
Merge branch 'develop' into bugfix/plugin-conflicts
Formatting, renaming to Plugin-Conflicts-With