Merge task_mgmt to master