Merge "Fix 2-level task to 1-level task (2/2)"