Merge "Fix nested trigger_jobs (A)"