Merge "Fix the extension list across jobs"