Merge "Fix nested trigger_jobs (M)"