Added option to disable automatic task re-scheduling