SI-6998 Improvements to the task-support API