added Taskmanager start option - not tested yet
Merge remote-tracking branch 'origin/master'