Simplify BuildSubtaskEvent
ID setting/handling
#6167
+2
−21
Merged