Move TaskGroup & TaskPrefix before TaskState
#4318
Merged
TaskGroup & TaskPrefix before TaskState
#4318