new helpers with task_data, minimal changes for compatibility with it
use task_data for scalars in merged tasks
Merge branch '15-task-merging' into 16