NR-873: Task plugin
* adjusted on review