[DF-1093] fixes for sub-tasks